From b6c2df953dc50f009c8e15a77c35414940a106cc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 Oct 2001 18:59:46 +0000 Subject: [PATCH] Update. * gdk/tmpl/properties.sgml, gdk/tmpl/events.sgml, gdk/tmpl/regions.sgml, gdk/tmpl/general.sgml, gdk/tmpl/keys.sgml: Update. * gdk/gdk-overrides.txt, gdk/gdk-sections.txt: Remove nanox traces. --- docs/reference/gdk/gdk-overrides.txt | 5 ---- docs/reference/gdk/gdk-sections.txt | 1 - docs/reference/gdk/tmpl/events.sgml | 3 ++- docs/reference/gdk/tmpl/general.sgml | 11 +++++---- docs/reference/gdk/tmpl/keys.sgml | 6 ++--- docs/reference/gdk/tmpl/properties.sgml | 3 ++- docs/reference/gdk/tmpl/regions.sgml | 32 ++++++++++++++----------- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/docs/reference/gdk/gdk-overrides.txt b/docs/reference/gdk/gdk-overrides.txt index 14eed81159..ff7d773a1d 100644 --- a/docs/reference/gdk/gdk-overrides.txt +++ b/docs/reference/gdk/gdk-overrides.txt @@ -39,11 +39,6 @@ struct GdkDrawable #define GDK_WINDOWING_WIN32 - -GDK_WINDOWING_NANOX -#define GDK_WINDOWING_NANOX - - GDK_WINDOWING_FB #define GDK_WINDOWING_FB diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 803885d2e7..f3e44cccb2 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -52,7 +52,6 @@ gdk_error_trap_pop GDK_WINDOWING_X11 GDK_WINDOWING_WIN32 -GDK_WINDOWING_NANOX GDK_WINDOWING_FB diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml index 4d75db6a75..f7955489a7 100644 --- a/docs/reference/gdk/tmpl/events.sgml +++ b/docs/reference/gdk/tmpl/events.sgml @@ -141,7 +141,8 @@ This is the priority that events from the X server are given in the - +This is the priority that the idle handler processing window updates +is given in the GLib Main Loop. diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml index abb933b56a..849da55ec7 100644 --- a/docs/reference/gdk/tmpl/general.sgml +++ b/docs/reference/gdk/tmpl/general.sgml @@ -115,18 +115,21 @@ of g_atexit()). - +Gets the program class. Unless the program class has explicitly +been set with gdk_set_program_class() or with the +commandline option, the default value is the program name (determined +with g_get_prgname()) with the first character converted to uppercase. -@Returns: +@Returns: the program class. - +Sets the program class. -@program_class: +@program_class: a string. diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml index 907d4d5499..7ce60f16ab 100644 --- a/docs/reference/gdk/tmpl/keys.sgml +++ b/docs/reference/gdk/tmpl/keys.sgml @@ -171,11 +171,11 @@ gdk_keymap_translate_keyboard_state() just to get the keyval. - +Returns the direction of the keymap. -@keymap: -@Returns: +@keymap: a #GdkKeymap or %NULL to use the default keymap. +Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL. diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml index caee1ac68c..d2bbbc0d99 100644 --- a/docs/reference/gdk/tmpl/properties.sgml +++ b/docs/reference/gdk/tmpl/properties.sgml @@ -51,7 +51,8 @@ of strings on the X server. - +A null value for #GdkAtom, used in a similar way as None +in the Xlib API. diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml index 77b197f74d..0f3072fc66 100644 --- a/docs/reference/gdk/tmpl/regions.sgml +++ b/docs/reference/gdk/tmpl/regions.sgml @@ -291,32 +291,36 @@ or the other of the two sources but not in both. - +A GdkSpan represents a horizontal line of pixels starting +at the pixel with coordinates @x, @y and ending before @x + @width, @y. -@x: -@y: -@width: +@x: x coordinate of the first pixel. +@y: y coordinate of the first pixel. +@width: number of pixels in the span. + - +This defines the type of the function passed to +gdk_region_spans_intersect_foreach(). -@span: -@data: +@span: a #GdkSpan. +@data: the user data passed to gdk_region_spans_intersect_foreach(). - +Calls a function on each span in the intersection of @region and +@spans. -@region: -@spans: -@n_spans: -@sorted: -@function: -@data: +@region: a #GdkRegion. +@spans: an array of #GdkSpans. +@n_spans: the length of @spans. +@sorted: %TRUE if @spans is sorted wrt. the y coordinate. +@function: function to call on each span in the intersection. +@data: data to pass to @function. -- 2.30.2